data: Drop org.gnome.Shell.desktop

gnome-session no longer launches gnome-shell via a .desktop file,
because gnome-session no longer has a builtin service manager.

gnome-shell is now always launched via systemd

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3806>

diff --git a/data/meson.build b/data/meson.build
index 114dd2010ef5855e940bdc3019c71db6c83cabbd..d48308743cbf29c64b767ba8d28694f6e2a4a128 100644 (file)
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,6 @@
 data_builddir = meson.current_build_dir()
 
 desktop_files = [
-  'org.gnome.Shell.desktop',
   'org.gnome.Shell.Extensions.desktop',
 ]
 service_files = []
@@ -11,19 +10,9 @@ if have_portal_helper
   service_files += 'org.gnome.Shell.PortalHelper.service'
 endif
 
-desktopconf = configuration_data()
-# We substitute in bindir so it works as an autostart
-# file when built in a non-system prefix
-desktopconf.set('bindir', bindir)
-desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
-
 foreach desktop_file : desktop_files
   i18n.merge_file(
-    input: configure_file(
-      input: desktop_file + '.in.in',
-      output: desktop_file + '.in',
-      configuration: desktopconf
-    ),
+    input: desktop_file + '.in',
     output: desktop_file,
     po_dir: po_dir,
     install: true,

diff --git a/data/org.gnome.Shell.Extensions.desktop.in b/data/org.gnome.Shell.Extensions.desktop.in
new file mode 100644 (file)
index 0000000..9c3b6bc
--- /dev/null
+++ b/data/org.gnome.Shell.Extensions.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+# Keep in sync with subprojects/extensions-app
+Name=Extensions
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.gnome.Shell.Extensions
+# Never launch this, just provide name+icon to portal dialog
+Exec=false
+OnlyShowIn=GNOME;
+NoDisplay=true

diff --git a/data/org.gnome.Shell.Extensions.desktop.in.in b/data/org.gnome.Shell.Extensions.desktop.in.in
deleted file mode 100644 (file)
index 9c3b6bc..0000000
--- a/data/org.gnome.Shell.Extensions.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-# Keep in sync with subprojects/extensions-app
-Name=Extensions
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Shell.Extensions
-# Never launch this, just provide name+icon to portal dialog
-Exec=false
-OnlyShowIn=GNOME;
-NoDisplay=true

diff --git a/data/org.gnome.Shell.PortalHelper.desktop.in b/data/org.gnome.Shell.PortalHelper.desktop.in
new file mode 100644 (file)
index 0000000..f70e7e0
--- /dev/null
+++ b/data/org.gnome.Shell.PortalHelper.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Network Login
+Type=Application
+Exec=gapplication launch org.gnome.Shell.PortalHelper
+DBusActivatable=true
+NoDisplay=true
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.gnome.Shell.CaptivePortal
+StartupNotify=true
+OnlyShowIn=GNOME;

diff --git a/data/org.gnome.Shell.PortalHelper.desktop.in.in b/data/org.gnome.Shell.PortalHelper.desktop.in.in
deleted file mode 100644 (file)
index f70e7e0..0000000
--- a/data/org.gnome.Shell.PortalHelper.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Network Login
-Type=Application
-Exec=gapplication launch org.gnome.Shell.PortalHelper
-DBusActivatable=true
-NoDisplay=true
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Shell.CaptivePortal
-StartupNotify=true
-OnlyShowIn=GNOME;

diff --git a/data/org.gnome.Shell.desktop.in.in b/data/org.gnome.Shell.desktop.in.in
deleted file mode 100644 (file)
index 59d1cd2..0000000
--- a/data/org.gnome.Shell.desktop.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Shell
-Comment=Window management and application launching
-Exec=@bindir@/gnome-shell
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Provides=panel;windowmanager;
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@